]> dgit.raspbian.org Git - gnome-shell.git/commit
projects / gnome-shell.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b6ec508) | patch
Merge branch 'workspace-salon'
authorColin Walters <walters@src.gnome.org>
Mon, 19 Jan 2009 23:06:59 +0000 (23:06 +0000)
committerColin Walters <walters@src.gnome.org>
Mon, 19 Jan 2009 23:06:59 +0000 (23:06 +0000)
commit5afcf07782b58a70568f750cdee20b67688ab487
tree8824ea12a06183555a215be96fcfc79456ac264ftree | snapshot
parentb6ec5080c887fb9e05d134bde0135727fc278a13commit | diff
Merge branch 'workspace-salon'

Conflicts:
src/shell-global.c

svn path=/trunk/; revision=152
configure.ac diff | blob | history
js/ui/main.js diff | blob | history
js/ui/workspaces.js diff | blob | history
src/Makefile-taskpanel.am [new file with mode: 0644] blob
src/Makefile.am diff | blob | history
src/gnomeshell-taskpanel.c [new file with mode: 0644] blob
src/shell-global.c diff | blob | history
src/shell-global.h diff | blob | history
src/shell-panel-window.c [new file with mode: 0644] blob
src/shell-panel-window.h [new file with mode: 0644] blob
Unnamed repository; edit this file 'description' to name the repository.